merge
authorStefano Stabellini <sstabellini@xensource.com>
Wed, 4 Aug 2010 14:58:10 +0000 (15:58 +0100)
committerStefano Stabellini <sstabellini@xensource.com>
Wed, 4 Aug 2010 14:58:10 +0000 (15:58 +0100)
commitcf2be3f6e236be020c6830914b1ccd8fcc6df954
treeed354c68d6d0913eea8c399bd953bc9b3047ea65
parent072186cf673d593478aced4614be65d19f459818
parent98398f12125f06a8abb66043f52798ddbe5a4609
merge